projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94c9120 8dd0e84)
bitkeeper revision 1.1049 (40ec4ff2Ste8alBZJQMMHa4bDp5ShQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 7 Jul 2004 19:33:06 +0000 (19:33 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 7 Jul 2004 19:33:06 +0000 (19:33 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/hp.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
tools/python/xen/xend/XendDomain.py patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc tools/python/xen/xend/XendDomain.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.